Merge "Split CTS device setup into separate stages." into gingerbread