Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: Ic58fbacc9200ce8e802d915ee6c5bdbcb9b3b309