Merge "cutils: trace: add DATABASE tag"