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