Reintroduce convention for CDIUI mapping (#12385)

Change-Id: Icf65e540362329ea593349e6977c8ab6e876b4a0