Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: Ied615f07e5617f89603f29f94846edd58c32a3a9