Merge "Addressing comments in 1130236." am: dd7288d83b
am: 472d7ada1a

Change-Id: I496d11fee1523979c90c41bd84366de9414c07ec