Merge "Address some review comments for aog/415919"
am: c18f3d08f7

Change-Id: Idd1032753ee662167af05e49b737523953bad2eb