Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I9d3335dcb08fc53d18bec993b89047b409bd7eb1