Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: I3120652020626880a6f412b36ac4188f7ff86bbd