Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I2fd1f5824ec23ec27d10d5a59f1aa3c9e62f30f7