Merge "Amend typo for AppOpsManager" into main