Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Ia27e39b9cceb9f9b281266420c6d9bd5f0357746