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

* commit '77c0b8d6e6cc4ba2482c45791cdf76ef08d0cc04':
  Address comments on change 45d26c86b00580593067ca42091ad66cf7dc4f7c