Merge "Add support for new SessionManager and EventManager tests"
am: 42598f4a96

Change-Id: I9c629074ca39dfb06bd6b16217ba5e59a9e0a004