Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I07848840df4da46e0aa5b11fb8533dafb972af91