NXP-14826: Handle backward compatibility
Cosmit: fix pep8 warnings