Fixup autocreation for cdb entries

Change-Id: Ibfbdddf2b273be5ed26dd95e2fd37a87c064e742