Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Ie792d0b51f6c9fb5db8718259ebee6ebc9ced812