Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I5774336fe7d1c24768a71ade669cc8c39af8b02c