Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: If06f462030f7d7083d006216d7265d1bf28604ba