Merge "Address review comments for change 25352fc06c84cdab8a2ab."
am: 1ec37ada35

Change-Id: I31e88cef1bc1dbcef2bd84dc9dbac2b13723bc40