Merge \"Changes for upgrade to OkHttp 2.7.5\"
am: 9ca932b06e

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280
tree: a2ba1a5ad761756b2229df4147d00a9f9fffbcee
  1. core/
  2. services/
  3. tests/