[chromium-freeworld/f30: 4/4] Merge branch 'master' into f30