Move session creation up to shell

Change-Id: I65d3f37f60f97240b52b0234da6160121ec292e1
Merge "Move session creation up to shell"