am 164eb050: am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread

Merge commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34'

* commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34':
  Fix typo and bug in CTS test class.