Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I0b484281e860eba67fd4bbc3e77546c129375469