am 61fc13f1: am 0717235e: Merge "Split CTS device setup into separate stages." into gingerbread

Merge commit '61fc13f17c3622fc1ccda42dc20f1a758b5cb9f4'

* commit '61fc13f17c3622fc1ccda42dc20f1a758b5cb9f4':
  Split CTS device setup into separate stages.