Merge "Address some comments for aog/333864" am: d458d08391 am: 7d3000e320
am: 04a1bfec0d

Change-Id: Ifc57dda2f61b150dc6dfa4f8c006cc8221c1dd35