This removes the necessity of registering the storage for CCC and make it part of the declaration itself. Fixes #18547 Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>