Merge "Address review comments for aog/411660" am: de944ae152
am: 3507e65e02

Change-Id: I0f55b9d68b2cc3229562f0e82728597bbcff9580