Merge "AppOpsService.dump() over-used iterator fix"