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

Change-Id: Ic9cbdf2cee9508b595524bac6cd8763b83acf380