Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: If62909d7c4061d6f5c5ea72115270326b92a45db