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

Change-Id: I9bf94601840a8641225f6e03aef180bb863cf463