Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: I22121ada0a0b5a9ba4b91c7d2855fdf7edab1701