Reintroduce convention for CDIView mapping (#12385)

Change-Id: Ice09c937f9d78d61450ff36c519eca568d5106e9