Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: Ifb14efeced5ba52847caa568b8e5cdf9d3203d23