Merge "Fix Rcs1To1Thread creation"
am: e7c780d4e6

Change-Id: I75bc92ad7ab8a28b5583e1b26b2b19a2815adc95