NXP-11487: Update default values
NXP-11966: Remove rightsAddManager class and clean up