Reverted commits to temporarily fix GPS issues on Jewel device
s4-common: fix typo when renaming netmgrd