Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2 am: 313e645801
am: 3c2c2764d4

Change-Id: I14e60ae916b81d5193d2bc08daa63282d426a49f