Dual Status - J1 and L1 visas - Am I considered as a resident alien for 2018 tax return ?

I was a non resident alien from November 2016 to April 2017 with a J1 visa and then resident alien from June 2017 to December 2017 with a L1 visa. 

I was working for the same company in the US.

Am I considered as a resident alien for 2017 ?

What forms do I need to fill for 2018 tax return ?


Thank you