Merge "AppOpsController implements Dumpable"