Merge from Chromium at DEPS revision 37.0.2062.117

This commit was generated by merge_to_master.py.

Change-Id: I9cd955d97932b42739ee7e6abb42e1f05d514410