Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I57b6756041ffdfd7c077fbcf3021216eaef0e7b1