Remove hardcoded foreign keys from db.catalog.api

Change-Id: Icc5af337c7aa9621bd8b557be8b87413c053be88
Merge "Remove hardcoded foreign keys from db.catalog.api"