Synchronized with Chromium_v26 branch using Meld
Merge branch 'Chromium_v28' into Chromium_v26
Merge remote-tracking branch 'origin/Chromium_v26' into Chromium_v28