Merge "Fix typo and bug in CTS test class." into gingerbread