support for currentActivity

Change-Id: I4a1d6c91eabf94d4a194112483ea33522dc1f2ff
fixed junit dependency

Change-Id: I3ac285182c0d68b8fb6e9721ea7ab4ad63f5794f