Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: I91d21ab8ffe178d0aa9f8b6b5d5e8770e51a9574