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

* commit '3edc93266de2e4ed17ac059d3606ac021bbc93ee':
  DO NOT MERGE Update CTS Version to 4.2_r3