Merge "Stabilize AAIServiceTreeIntegrativeTest, assuming a Mocking issue"