Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: If68565edc37f9a7c05edc557edd8ece69c9f31d3