[TF-M] Two changes merged by mistake

Hi all,

Two changes that have underwent multiple rounds of review and test were accidentally merged instead of being pushed for review and final approval. I was at fault, apologies for that.

Additional tests of the changes flagged up no regression. Let me know if you have any concerns or questions,

Thanks and regards Miklos