Merge from Chromium at DEPS revision r216896
Ben Murdoch authored
This commit was generated by merge_to_master.py.

Change-Id: I595ee04895ccfeb752d5798668ae0cd67346dd2b
4311e82a