Merge "Temporarily disable AppOpsServiceTest#testShutdown, remove unused imports" into sc-dev