Merge "Allow appops command to modify uid ops." into oc-dev