[chromium-freeworld: 18/19] Merge branch 'f31' into f30