[chromium-freeworld/f34] (4 commits) ...fix