Merge "Disable AppOpsLoggingTests" into sc-dev