Merge "Remove AppOpsTests from GSI" into sc-dev