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

Merge commit '0717235eb5a5b761f3549f1c2b8c94019b9d6220' into gingerbread-plus-aosp

* commit '0717235eb5a5b761f3549f1c2b8c94019b9d6220':
  Split CTS device setup into separate stages.