Merge "metricsd: Specify directory for persistent integers." am: 8a2a635d3c am: 20bb55e6ea
am: f9699e710c

* commit 'f9699e710cd903a783ffb18147785983ed2b7336':
  metricsd: Specify directory for persistent integers.