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

* commit 'a1d770a4f3569a73190785ae8e08942c9fdf1ae2':
  Modify criteria of CTS