Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I6d2528edf9fe3246f921ce5858813fa4bc3b997d