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

Change-Id: Ia0ad6dfb81d3dda838916c4245917ba9e56ed0af