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

Change-Id: I5619db03f95fbd07396783987a2d59c9f283adad