Address comments for aog/934603 am: 5a83225872
am: a9060237ad

Change-Id: I0e25f6c536f16d76921ad44f95a2708abbddc808