Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786  -s ours am: ccec8919fe am: a895383b44
am: 02a42886ac

Change-Id: I5652f26f1a0d2c88c432a3eae0d58ef1477c986c