Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I9cafa3128d903afe45dc0db73e97b81c6643235d