Roll to r13493

R=rmistry@google.com

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252017 0039d316-1c4b-4281-b951-d872f2087c98
LKGR w/ DEPS up to revision 252017