Merge from Chromium at DEPS revision 37.0.2062.21

This commit was generated by merge_to_master.py.

Change-Id: Ie7de57d4657b90fbbcb2617577a154b9492f6d1a