Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ie02412c219d8a2b0cce13107ec58189d28a0085b