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

Change-Id: I77dd1ae685a744b0a10e767075631ef880b96c35