Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ie883ed7742481f2fb273d0df04730b7490530d49