am 1f335371: am 2b300c87: Merge "DO NOT MERGE Update CTS Verifier to R4" into jb-mr1-dev

# Via Android (Google) Code Review (1) and others
* commit '1f335371e2befbb656a1201b080c4376b3e049d4':
  DO NOT MERGE Update CTS Verifier to R4