Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: I01211393e835beaa5dc48a084cebd6bac994d48c