Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I7f2dfa37d36574fd3a16fe99e51111d9761e67d6