Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I8fa10748f358dba026c052d6269c4fe25dbcb158