Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: Ia957cd5569a5c62711d273132c342efa9c54f05b