[TF-A] Re: Unable to merge gerrit#33536