Fix svc_monitor unit tests

Closes-Bug: #1366025
Change-Id: Icc3b90bd077188477ef2cfb617307c9f8e3ec955
Merge "Fix svc_monitor unit tests"