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

Change-Id: I59ed301407584fd1537de18f09e1ad76da8ebb35