Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: Idbc8b9994bca3611cf4ac100cc627b0bcd6e0c61