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

Change-Id: I0c606de6d7bd7eb37a3748c2f6ab3be889f933a6