Merge "Allow getResponseCode to block if response hasn't been received from remote" am: 834e5ce170
am: b987832918

Change-Id: Ie688a54c9774b269b90cd96aecfc7ef6a621bf86