Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: If45a91be8471693c7b69e2f3a033ddd79e65ef0e