re-lands 18858006 which was reviewed by:
abarth@chromium.org
toyoshim@chromium.org

BUG=163795
TBR=crogers@google.com

Review URL: https://chromiumcodereview.appspot.com/19695015

git-svn-id: svn://svn.chromium.org/blink/trunk@154858 bbb929c8-8fbe-4397-9dbb-9b2b20218538