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

* commit '20bb55e6eadc9f07581357c71b841672bea26335':
  metricsd: Specify directory for persistent integers.