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