Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I4f8394192c0b95db4af9f920d3fae7980a53d4ec