Merge "Null check for the return value of getPackagesForOps()" into main