Merge from Chromium at DEPS revision 37.0.2062.117

This commit was generated by merge_to_master.py.

Change-Id: I0d2e4648854e365b34df66f3e7ba6b3362a39f17