Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9b8c24a2c9353e5294bbb77dda6a685a0e3117bc