Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3935ce20042ee59bb9736ae4513b42cb5331c97a