Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I7eb824a21f77440c6f05eba174a6c87f0c924ff3