Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I54e16638ce776c9a764ddd7eb96351f332ecbf3e