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

Change-Id: Iac6549fc8216edd7b6f6469f3bf4bc1a06432cd2