Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev