Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I27573167ac95c0f5c3a3cecd2c29bb0ddbacef70