am 93c07c54: am 3edc9326: Merge "DO NOT MERGE Update CTS Version to 4.2_r3" into jb-mr1.1-dev

* commit '93c07c54a48ffc5413e841a0748e4cf1a3357068':
  DO NOT MERGE Update CTS Version to 4.2_r3