Merge "Replace deprecated HTTP.UTF_8 with Charsets.UTF_8"