Merge "Update AAI-Simulator Support for Service Level Upgrade"