Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I1fbb0d3506830a40719eda26f66e0b991ebb7eca