Merge changes Ia7850577,Ic96e9e14
am: 82650bb98e

Change-Id: I897f733682c1ef6b08e0c2c79ee098bbd9367817