Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: I3482cf8f4cb05f125009d224dcff02ca57b23446