Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I75d359f456099d3afd73d018461753b45748164d