Merge "Fixes associated with OkHttp fallback changes"