Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I7bb0a3d11ec1ddc7ea260f4756cfad285f1ec566