Merge "Create non updatable system server stubs"