Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: Ie368ad310b862ba6f4c38d50d6ef427a39a19def