JBM MASA: CNA and CNG not in sync with non-JBM decoding

Basic info

• Commit SHA: 3e68439f
• Platform: all

Bug description

CNG and CNA handling is not in sync for decoding MASA

Ways to reproduce

(Clear steps or refer to a failing automated test, e.g. with a pipeline link)