Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I4e8637e16a2e9bc05449ac063fd12b3f48ca383b