Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If8ed8205965069f18d774f19c64be6d4387bed87