Merge "Add initial support for RuntimeService"