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

Change-Id: I8c045b24679ae05ffa804e89bf2b2eb842637fd3