Merge changes I2a073293,Ia55ef8b9,I79a385fc
am: 82b5c619b8

Change-Id: Iec41ebf6c7cd0ade134e622e9dfec483491f9e9c