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