NXP-11558 Add logs
NXP-11558 cleanup