Merge \\\"Changes for upgrade to OkHttp 2.7.5\\\" am: a31247bd8d am: f6bcab7f97
am: 6b473f7b67

Change-Id: I3a0dc1da2ee96d71c38cab727141efcb686627e1