Framework: Cleanup public.xml layout for CM additions

Change-Id: I0753bc484883ff7f9d2e79f0f8d26a309493bc8d