Merge from Chromium at DEPS revision 39.0.2171.44

This commit was generated by merge_to_master.py.

Change-Id: I910b0134e56d6e4b8a1e93b6097fda646aedf11d