Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I708b08f68e2ffaf5f127f628e6d299007754091d