Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: I4cfecfacb3293a25d8dfa1ea57db11359365aa9d