Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: Ibdfd7c22c87e88c364f51632ce079d66e5f90d4e