Merge "Separate the new P functions from the new P behavior in the docs."
am: 2cb18c3460

Change-Id: If5468335c64767a29399fc54858fb2aa37fd1f71