Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: If4ff821474cc985d0bc16bc22c8180c8bec48014