Merge "Add null check before trying to give appOps to package." into sc-dev