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

Change-Id: Ie1723fe35a6b005e962929661236ccdfa3845cc9