Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: I665cd5f3cf00ca7782d5114c4c4de9f4645addff