Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: I62a08376cdbd3239accbd8ae137a9caf603ae65b