am 47dfbd86: am 505ac288: am 60281b88: am a6d1b402: am a1d770a4: Merge "Modify criteria of CTS" into lollipop-mr1-cts-dev

* commit '47dfbd863839de858843c13bfa10d0f5d3ea7a87':
  Modify criteria of CTS