Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: I7c4fbd5691ba418842ccac05df353d52d3817973