Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: Ia542726d5df7935b2f79e8de6880d101853bb4c9