NXP-14893: adapt api to 5.8 backport
NXP-14892: adapt api to 5.8 backport