Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: I5ecd0c5a352c96b180972dd1dfdc96b32cf123e2