Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: Ic24941419d0c400c94c7178dd881c03c18ff508b