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

* commit '90bfc8035b8a188c0af9f74ad54b73bf8ac198f4':
  metricsd: Cleanup on TERM signal.