Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: I7981e2b0356dfc87f80e08615dfb9144a31ff55a