Merge "combine wait for exec log with service exit log"