Merge "Address comments from aog/303658."
am: ab39c21007

Change-Id: Ia9eed86c3cb3e6dcee24e43b652b47ed35f6494a