Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: I03515f5593f3032c71d51ed0b8ae46565dbc05bb