Merge "Fix the issue with pomba srv decomp aai client"