Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: Ic8238bf8d72129765d38507e8b5fef9adb2fdd27