Former-commit-id: 125546e4da877fbb732b9fa40c68b08bc764f8e0
Amend: Updates from peer comments. Change-Id: I78231666266335cb01251197b7cc9b47641e53fb Former-commit-id: 49f674d14cd9e7a42c295cc1db2fe36c645366f5