Merge "Remove invalid source tags in AppOpsPolicy" into sc-dev