Merge from Chromium at DEPS revision 241094

This commit was generated by merge_to_master.py.

Change-Id: I2ecca578cdf5afd35db75ada0a7cd79b940541ca