Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ic9da81994f43905988e2cb12977829d61541dfb2