Merge "Re-enable AppOpsServiceTest#testShutdown" into sc-dev