Merge "[automerger skipped] Merge "Fix RcsManager and add empty RcsThread class" am: 170c382729 am: 28534639bc am: 661f548304  -s ours"