Checking this in separately to avoid issues with trybots.
The corresponding CL is at https://codereview.chromium.org/14801009/

BUG=232958
NOTRY=True
R=tedchoc@chromium.org

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

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