PR:2209&2922 - Database Purge changes

Change-Id: Iadee42bb930f4d0d3d5c7e0948e8b30e90348b30
Merge "PR:2209&2922 - Database Purge changes"