Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I8895603818f261bf1b301f727708e144bec345d3