Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: I7bfd484a94a948094969e81de49bceec18e0af9b