Fix AMBA additional role assignments (#1371)