Amend: Updates from peer review. Change-Id: Ib5719f711234005e021bc4d8dec899289d8b447b Former-commit-id: 6c7e2ac2a7 [formerly 9374912aeb3e3a642d34a0aec75bcda7c707bcf9] Former-commit-id: 1a43f04b16
6c7e2ac2a7
1a43f04b16