Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev