Merge branch 'soc-for-4.8' into 4.8-all