Merge "Remove client code from apex-pdp"