Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I134db89f4213aeb80ae690775dd58ee33bf4a76e