Merge from Chromium at DEPS revision 37.0.2062.21

This commit was generated by merge_to_master.py.

Change-Id: I788812192d2dd69f7053fd1c1b61a28504a9f477