Merge "I2C: Master id, sda and scl update"