Merge changes Ibfc261d8,I2c9001ef am: 13954964bc

Change-Id: I0727390174eaf490a9355f22a163c745640b5e41