Merge changes I94d15307,I7deb8556,I755b3140 am: 5aef5c6508
am: b7493c6059

Change-Id: I5f316278424f6c072c14f52e067d3306491b4a13