Merge branch 'regulator-4.17' into regulator-4.18 merge window