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

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
d0247b1b