Merge "Address review comments for change 25352fc0." am: 1ec37ada am: 5d722d83 am: dc7ab3a0 am: fae353b7 Change-Id: I5d0b1c5537609abc0413b0a82b7dcb47ed113b47