Simplify AIS injection approach

@bug W-2021909@
@rev goliver@
Update UID goldfile
Merging origin/dchasman/master-pending-simplifyAISinjectionRound1 into master