Merge changes I90e10c74,I038d1df4,I4299bd96 am: 73d44bb6c2 am: 72138abaa7

Change-Id: Ifa3354b755dab76cff00f3e7ceb0a80e5dd6657d