Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: Ifc338f5b8888c5aa5679442334c2fb0e87a12a83