(no-ticket) Improvements to PARegistration model.

Change-Id: I02a97770558395e854cce873d95dbebf3fe95808