add sessionwatcher

Change-Id: Ib05a3745b91d324f786948688fe1984c3b1cc0fa