Merge "[AAI] Fix AAI service monitoring via Prometheus"