Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: I476b16b8d61432a5a24a472a8d775f0f80769854