Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: Ia77a364668c08759816cc3fd33e8e0fdf6e68907