Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: I60d0e38401d2444cd8c029e28b930554938d39c7