Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: Ica97c45338cc152d9589ffd5a71ea9575f07d2a8