Merge "Remove ServerSessionContext from Core Platform API"
am: 33f05843eb

Change-Id: I251d800d13877354692f94cefbcd345f9b7f6451