Merge changes Id642f836,I5550b1ca

* changes:
  Move most of AppOpsService implementation behind an interface
  Copy AppOpsService into AppOpsCheckingServiceImpl