Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I746d5be76019b85e4be03e63a7511c9b432cb3b8