Merge "Addressing comments in 1130236."
am: dd7288d83b

Change-Id: I2a404f3680e061bebbd0f7e2c13d799ef56f0fff