Merge "Make system_server stubs consistent with other stubs" into rvc-dev