Merge "Fix RcsManager and add empty RcsThread class"
am: 170c382729

Change-Id: Iaff413687ffc4fcca9db3e9648fc3ea0bba295c1