Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: I64ade7f09d2b962ca9149b1fa2abfbc91bfe0832