Fix fallback from websocket when behind proxy (#13299)

Change-Id: Id12cb97816afde4363caea20ff30376ff9cdb173
Merge commit 'd7b1931270d37360a0418b1cae4d980287b05f38'

Merged as no-op because master already uses a newer Atmosphere version

Change-Id: Ic89700b5671ad948146626d2f76a103836bf526e