Merge "Revert "Add WTF when a system server wrapper can't be found"" into...
Merge "Revert "Add WTF when a system server wrapper can't be found"" into rvc-dev am: 6d81a5f5 am: 59807937 am: dc5bd32c am: e005b8be
Change-Id: I8cb3fba1cb662051ec6dfbd1cf5c91625c6271cb