Merge "Address revew comments for change Ia653d2c72df13889dc85dd8c84997582c034ea4b."