Test update for AIS , part 1
@rev gtorres@
@bug W-2348095@
Merging origin/lin/master-pending/ais-test-part1 into master