Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I90a2e3448bc474e1c91f694dd91b665aadb70a35