NXP-15159 cleanup to reduce requirements in implementing classes
NXP-15159 avoid breaking API