Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: Ib617ae43c5de9bee8a73120a7d1ba6818bae031f