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

Change-Id: Iad1cb66af371013597647eb903a55d87ce7ed248