Merge "Address revew comments for change Ia653d2c72df13889dc85dd8c84997582c034ea4b."
am: e2ced0db78

Change-Id: I11254bf9114ee61dbc96f447237abbef9e7c7faf