Merge "SSL setup for AAI and simulator"