refactor: Use branchId in place of branch where possible

Change-Id: Ib5026f8729f21d5fe0452bc5f489648aebb22bfd
refinement[ats_ATS29345]: Remove branch guid insertion code

Change-Id: I6c823d107b3ad87c18cde893d8adab877e04a6ba
refinement[ats_ATS81395]: Limit non-tagged gammas by type

Change-Id: If5730ba2d9e025b524f2b4d9f843af2fedba0123