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

* commit '505ac2884039eca8c28abf6b045e56eaa89e045a':
  Modify criteria of CTS