Merge "Bump apex-pdp to 2.2.1-SNAPSHOT"