Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I352045c456812e4311361c41049f1f6bcbeec5a3