Merge "metricsd: Cleanup on TERM signal."