Implement session keep alive

Change-Id: I33b662dcc113f489d055dd8bac3a394e74b3ebe4