Merge changes I2a073293,Ia55ef8b9,I79a385fc am: 82b5c619b8
am: 5a0afe7d27

Change-Id: I7dca568166725342be1f8a2fcf7db7fa250ab394