Merge "Improve AM lifecycle event logs"