Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I923cbe0ba3860d88b6ab18e1aacfd145738fd6fb