Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: Id5c8e56e82b06bb1c52a98c1e5aca7cb910969ab