Synchronized with Chromium_v28 branch using Meld