Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I71036e99c61bca289d1c13e6c85507b505441b49