Merge "Address some comments for aog/333864"
am: d458d08391

Change-Id: Ie7b2fad86ca9d2f61f2718ce661f9477db780d4e