Merge "Fix pdp group info not there for legacy policy"