Merge branch 'for-4.15/sony' into for-linus