This will pull in a fix for the bugs below.

TEST=try
BUG=69470,69573

Review URL: http://codereview.chromium.org/6248005

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