Merge from Chromium at DEPS revision 39.0.2171.37

This commit was generated by merge_to_master.py.

Change-Id: I214889d68bf1b0425ad3bebf31017dc119028ac3