Merge "Handle null list from getPackagesForOps" into nyc-dev