Merge "SO Support for new AAI certificate"