Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: Ia3d0f40b6945e5c9f5063a1b329881a2a4de2bb2