Merge "Fix PerDbnameStatsdDataFactory metric prefix"