Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I404bf54b087ddac7e6d12e59c263c25697bc0d1c