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

Change-Id: I47cf82bf3fe903e6e3b3bd07ac4591c5a7ce4841