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

Change-Id: I6f3478bb6319439f71983f4b4b32dd49112493ab