Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: I5413d0dd18c4b56b1dd575602d87319bd172c732