Merge changes I47ec8fcb,I2cd200f3