Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ic71ad35627ded2f47ddca8c9f2d5d26d3be3e023