Merge "metricsd: Cleanup on TERM signal." am: 90bfc8035b
am: ab196259d0

* commit 'ab196259d0893d69617506c0c365a9e54613d2f6':
  metricsd: Cleanup on TERM signal.