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

Change-Id: I234af1d1f26e5dea1ad265b97fc115431094fc79