Merge from Chromium at DEPS revision 251904
Torne (Richard Coles) authored
This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
5d1f7b1d