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

Change-Id: Ie72b9b8452bb65e1dad98ee787cc522f55fe9664