Merge "Fix AAI-Simulator job by removing copy-paste code"