Fix API according to New Sessions Handling design

Change-Id: If9df75167894c95464d7d34945198d695b17fcf6