Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: Ice4cb8a566cd797c9f584a70f52ae2bded819550