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