Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: I1a1d8b499fa16ec0d0e32e8fa780bd9a037b79f9