Update formatting on database-related classes

Change-Id: I91f83e28ae25f80ba9e36c612f1ad050ffa1573c
Merge "Update formatting on database-related classes"