Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: If5e90bc6012d33cc92fc74693cfccfa4c959d35f