Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: I54f75b308bce168705d96d47643033a9b10974ff