Merge from Chromium at DEPS revision 241094

This commit was generated by merge_to_master.py.

Change-Id: Icc908c7651656b3a9f4a072d952354962e4113f9