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

* commit 'a6d1b40298f62e56b8ae2202b27f9b912785646c':
  Modify criteria of CTS