Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I83f80c35b32722035e9b918caf1d5a12b09b4a64