Fixup CDB listing

Change-Id: I7f726708d2e6e1dab813b58d0ca3bfd9366a430a