Merge "Allow getResponseCode to block if response hasn't been received from remote" into nyc-mr1-dev
am: 8a4db04893

Change-Id: I7e2f30316d15d8f66fffcb140522d75c65d29eeb