Merge "Add null or empty string check to checkCarrierPrivilegesForPackage." into nyc-dev