Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: If3a36be510d743e9885ee4ae9fac82b46599e315