Merge "atrace: add database tag"