adding multi-session support

Change-Id: I9c41caff0c5845ba01e8d25dc793b4b956c0e02b
17 files changed