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

Change-Id: Icb5c1d05b1b17b9c9ba986f40d200bd5d1ec1b87