Merge "Use PM instead of PMI in DefGrantPolicy for simple cases"