Merge "Revert "Add WTF when a system server wrapper can't be found"" into rvc-dev