Moved from global config to project local

Change-Id: I50c93e0d0bb79b045522f8cf4d8dc78fa7d665f3
Added db

Change-Id: Ibe983497163c9b3c27da6189f1b8a8cdf1de79c9
Merge "Moved from global config to project local" into develop