Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: Ib95554987a5db55831040a4cbec344911285b302