Merge changes Ie7bf555b,Ia7d5fbdc,I3f05ba19
am: e6b6640042

Change-Id: I0f652d5bb4a0b28a94975de6af219bf54350a682