Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I55f6f0d4aa2f2d6703ab960454b36af189f60527