Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I0eb93fb3da6da14bc2a8aff183402802a2f5aff3