Merge branch 'i2c/for-current-fixed' into i2c/for-4.18