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

* commit '60281b887e11a43a5338263618605e9c72af15b0':
  Modify criteria of CTS