Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: If4516ffa0889e0aafc1c29ff65cd2d5125661999