Merge "Modify AAI simulator to support new requests"