Merge "Fix PerDbnameStatsdDataFactory metric prefix again"