Merge "Clean up models-pap based on updates to models-pdp"