Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I427dd7cf3a8eefedf56b2bdccc882b0f13a6807b