Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: Ic063600f0ecbd8d3c74d2d514eaf91c1a33c9f07