Reg L1 / H1B Application after J1

[catchjit]

I am working at an MNC in India. Recently I visited USA for 3 weeks as short term J1 trainee (18 months program) with 2 years home residency requirement. My J1 visa is just expired but the program duration is still valid. I am getting a job opportunity in USA. Is J1 waiver is required to apply for L1 / H1B?
Awaiting valuable reply.
Thanks,