Merge "Register RttManager correctly"