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

Change-Id: If60b1200e90c4c1da098b16b300432cf9f00982d