am 17701f5c: am 77c0b8d6: Merge "Address comments on change 45d26c86b00580593067ca42091ad66cf7dc4f7c"

* commit '17701f5cb23f83b47972dbcb2a334986f8584cc9':
  Address comments on change 45d26c86b00580593067ca42091ad66cf7dc4f7c