b5b55c8012
This will allow DatabaseHeler to easily be moved to an independent class Change-Id: I9a3d5d3380ed0af246d7a01553a492467c3096b0