Merge "Add aah metadata service to whitelist DO NOT MERGE" into jb-mr1-aah-dev