Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Iec3a8d81a68a5c29672c64d8b8408fa7111fdf38