Merge "Replace source based system server stubs"