Merge from Chromium at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: I4dede67a4a965174a937505cd21ab0f4dda446f2