Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I9b4b5361ccb5171770607734cfb4e0e28bef35d7