Address comments for aog/934603
am: 5a83225872

Change-Id: Iabd57dca2aa2f1cdd363cbb23f92c457efbd6803