Merge from Chromium at DEPS revision 241094

This commit was generated by merge_to_master.py.

Change-Id: Idd43ea2a927fa7b7581a9c3ad66a4d5d2e86bb43