Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8e453b0fea071ecea4d10befb4e78b01d6ecfc15