Merge "Avoid DBPerformance log warnings in saveNamespaces()"