Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: I88982c1c25f25ef846e6bda10aececd98d25d2c1