Add @group Database tags

Change-Id: Icf525e355ae631fba9ad3c034827657e2a9884d9
Merge "Add @group Database tags"