Merge "Create non updatable system server stubs" into sc-dev