Merge "Avoid using stale sessions for cleanup alarm." into sc-dev