Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: Ia844626078f4a7313851912e34b1985d9033f8cb