Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: Id9832ab1559c6be7b68890be21e02a23214c7e5f