Progress towards DB approach on 1192715

Change-Id: I27c1d0a4f6d8f027847276925f0c16f01ede7491