Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: I9b1c013632df72dcd4e450d6a3b7749444191f77