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

Change-Id: I27443a9024ea4aff209a24a9049832a76f252476