Merge changes Ia9c95b10,I98f78f46,Ibf5e7ff7
am: 7ad38f39e0

Change-Id: I786c935761dde63e44207566747be85a65cf0ea3