Merge "Increase JUnit Code Coverage for PolicyDBDao"