Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6df8fa7ec5f5842ade5ab06a2ac42d49225ec245