Merge changes I90e10c74,I038d1df4,I4299bd96 am: 73d44bb6c2

Change-Id: Ia63c3ad5c91d59de688379c97a820899fe5400ea