[chromium-freeworld/f31: 2/2] Merge branch 'master' into f31