Merge "Clean up subId as parameter for skylo and OEM based NB IOT satellite" into main