Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: I283eef90c15d40ea8cd6290f12094fc152a2c45e