Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Icc576eeda9f370455c9b6fe2679d6f8422cc9a9e