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

Change-Id: Id5fd149f711ed4014157ddfb5b8705ff17bb0a5f