Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I637e50c43a3e8c49f48e71ae2ac091218f5425cd