[TF-A] Unable to merge gerrit#33536