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