Merge changes Ia7850577,Ic96e9e14 am: 82650bb98e
am: 022cd1ac66

Change-Id: I2ca636746ac1b550c149b20c2e137a539a148bee