Merge "Fix testAdminActionBookkeeping for AAOS" into sc-dev