Merge "Revert "Add NB_IOT_NTN"" into main