Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev
am: 103922f8c6

Change-Id: Ib67ba89902ebcdb8c8f0a9202e937a2e8ace4aa2