Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: If3d73ed87e487fb027aa4b16dd027424707d817c