Merge "Add more tracing to service lifecycle"