Merge "Preloading native policy type for apex-pdp"