Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: Idb5ee06ccec05b1a4a65ac9f612ec940887cefff