Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: I3dd2dcb2643f58bb4c09b12efb8b95063e3ee693