[PATCH 10/17] Updated mappings for AC-7*