Merge from Chromium at DEPS revision 37.0.2062.21

This commit was generated by merge_to_master.py.

Change-Id: Ib8f97b0e62297d90a0d0c332388078caa2a84fa7