Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Ie7e03af8dfaa5b30ca726cc6da94a1bbe34e0d59