Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I3590ff6b9511207e7c3fe2b8ae6eaa8e11342642