Merge changes from topic "an/fix-spm-mm"

* changes:
  SPM-MM: Re-enable disabled tests
  SPM-MM: Fix call preemption test