SIO-1492 AssertionError in evalmgr related to notifications

Change-Id: I8a81cb9dc1fc8d4063aa3414daf802980e4a7e5c
Merge "SIO-1492 AssertionError in evalmgr related to notifications"