Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: I89e719e0a39d423f48277f19fedadf46d9017167