Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I48f6b6ce9bb578d415ea07fa763e08f1ab5435b2