Merge changes I2c8b84b6,I0ce00cca,I78a83448 am: 08c51d9f2b am: 4ae4793721
am: 9caec6b454

Change-Id: Ide9d5171967c8a924bbc1c01aa684b9ce4020732