Merge "Fix Rcs1To1Thread creation" am: e7c780d4e6 am: 21f2840872
am: 4d7999b804

Change-Id: I6edba3f8c9efc4d215693c1b516596e554aaccea