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

Change-Id: Ie83b91cf4b1ee883d92721b195e323b2e35a2a68