Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: I44289eae0d6f96d69ea1bc0995713ccd6c89ca4f