Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: Ieba76347d96949c7e7a8eb9a3abf33e52ab0a343