Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: Ib6c0f30090524a36ba749238ae4d5256262ce2c5