Merge "Workaround for HttpURLConnection.getFollowRedirects() on M"
am: 3b37453b1c

* commit '3b37453b1c8a15265640cebf0973ef552e569d33':
  Workaround for HttpURLConnection.getFollowRedirects() on M