Merge from Chromium at DEPS revision 37.0.2062.21

This commit was generated by merge_to_master.py.

Change-Id: I11fd729892d9d5ce3f93e7e328b6aaebd7b5f0e0