Orphan DB data is removed correctly

Change-Id: Ib569f148007fd2e07aa2a81b25dea9da1586ab86
Merge "Orphan DB data is removed correctly"