Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: Ibb07e7633f0f96e925c9bd5cdcb91747ad656b6e