Merge "Remove unnecessary OkHttp reference" am: 90c72f2266
am: 62df7bd103

Change-Id: I7e6127f6c35d27a0b488a1cb69db9869cead4ab4