Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I91604de6853b611ffc31a57b7c7394e3c803bb2f