Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I7291f8532841cb77a9edcd27d8c28017f24c1215