Merge from Chromium at DEPS revision 37.0.2062.34
Bo Liu authored
This commit was generated by merge_to_master.py.

Change-Id: Iace2841ff698138e27700e5b50490b4b5c5f5ab9
08fd2243