Merge "[AAF] Make AAF ServiceMesh compatible"