Merge "Don't set RTT property if original connection null"
am: 2f66efef69

Change-Id: Ia340e1e547a8d0d3fa6c5633caead22ed8e5cd3d