Merge changes I2c8b84b6,I0ce00cca,I78a83448
am: 08c51d9f2b

Change-Id: I03f259d1a44017c5fe44155c27a8380f680d3e96