Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I065874c572b8625c38ce4e4de64c201df7b3d776