Merge "dev: gcdb: Update target API in GCDB"