(g2-M-28648): Apply new conventions for glyph granularity for a