Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: Ibe384572b8b1becf9f9d9257118e91880a12cc58