Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: I91fc8fc373e0cba6059b9a840c6d578a86852de5