Merge from Chromium at DEPS revision 39.0.2171.37

This commit was generated by merge_to_master.py.

Change-Id: Ib983c3241cf5b3272cbe4508db4a17ece333e1a9