Merge "Modify ConnectionServiceAdapter to include Session" am: 6acdeda101  -s ours am: 0d61bbb380 am: c29854a3e8
am: 991686f998

Change-Id: I636f0e01e1caec9e276b081601d6bb8613e14e9f