Merge "Temp. Remove MDSAL from aaa-app-config"