Cherry-pick from 100523003, make the tests pass again

R=efortuna@google.com

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