Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Iaec60dad30dfe6a2991379747622493b6069f51e