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

Change-Id: Ia5ebf8f639e1336e9e7278faf8eb09285d3c5507