Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I31e412e9e80caee55a69f9c498a2a5695ea74ac4