Original patch from dgwallinga@chromium.org at
https://codereview.chromium.org/23505003.

TBR=estade
BUG=258626,258649

Review URL: https://codereview.chromium.org/23454019

Patch from Dane Wallinga <dgwallinga@chromium.org>.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222147 0039d316-1c4b-4281-b951-d872f2087c98