Merge "Add server cert info for AAI mS"