Merge "Fix AppOpsServiceTest"