Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: If4b774ad99a11ef5f9fed899b6d07961ec89503a