Merge changes Ibfc261d8,I2c9001ef am: 13954964bc am: 1536cb65fd

Change-Id: I3a803c1e1e4260729c018e1b9631475a0d30adf2