Merge "Fix AppOpsServiceTest flakiness."