Merged crbug 298815 (rogerwang/chromium.src #3)