Merge "Override aaf_locate_url from values.yaml"