Merge "Update AAI credentials for AAF integration"