Merge "API Review: rename FEATURE_MANAGEDPROFILES"