Fix potential NPE in RemoteConnection. am: 9c2c583ad7 am: 16a2464291
am: 78e81ce277

Change-Id: I118a082f5f5724b48a4410a787272623d01051ba