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

Change-Id: Iacd73a61947c8620143891c3b9632162d0587163