Merge from Chromium at DEPS revision 37.0.2062.21

This commit was generated by merge_to_master.py.

Change-Id: Ic2d46a0df5223c1d1230928994ed6c755a81fae2