Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: I7b289e3f0f59b9e4bb88efef42759f358df3d55b