Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: Ia45aa9a671b471267a5e8ca43232e23b9c6dbc16