Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: Ifeb056ca7583771ebee7fc1a1b77742f83169cd5