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

Change-Id: I6b89ac596567848cdcc58c1ffac2da43631fcf34