Merge from Chromium at DEPS revision 37.0.2062.21

This commit was generated by merge_to_master.py.

Change-Id: Iee203e96f1d63d249e888ad91c547e9084a74313