Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: Ib7c08f7a72935d08151c90f550035659aa7205b5