Merge "Address some review comments for aog/415919" am: c18f3d08f7 am: 2804ff9ff7
am: 33904df530

Change-Id: I0d2085479384f72f3590a7e506a0c48ca17e1304