Synchronized harmless changes from Chromium_v28 branch with Meld