Merge from Chromium at DEPS revision 241094

This commit was generated by merge_to_master.py.

Change-Id: Ic69269a3a00901711ccf4510285c238b75be4236