Merge "metricsd: Specify directory for persistent integers."