Change-Id: I118afa785fff93251950f0f10e72979174de35cb Former-commit-id: cd85b148b6b267779d1fe8b510f14f63c45db77a
Amend: Updates from peer review. Change-Id: Ib5719f711234005e021bc4d8dec899289d8b447b Former-commit-id: 9374912aeb3e3a642d34a0aec75bcda7c707bcf9