Merge "Change guard pdp rest to new api"