db51 -> file per table

Change-Id: I011b5ad9ef2a3a176a7fe88f8a2bf692c7f24267
Merge "db51 -> file per table" into production