Merge branch 'sony_sources', remote-tracking branch 'origin/sony_sources' into sony_sources