Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Iaefacfbaf2c0ada6291fa03d6f3ff648e2d21956