Merge "Address review comments from change 000e1885701c8f."
am: 2ab98309c0

Change-Id: I71fe91a7065363a000f0577dd0e0e3f0d71f8175