Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: Iabd636d9f02be0b2aa1da9912eddb0f28f864124