[chromium-freeworld/el7: 5/5] Merge branch 'master' into el7