Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: Ic56ac0ad483d730efeb75b1f3b338ac16a79923d