Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: I0a8fcc549ea49204121e4e93738bdffcfbfeeefd