Merge from Chromium at DEPS revision r217092

This commit was generated by merge_to_master.py.

Change-Id: Id686c3257c13898b9bf2b05dc65eb0302739e3bb