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

# Via Android (Google) Code Review (1) and Brian Muramatsu (1)
* commit '2b300c8763cb58f8c52c0fb907a7c5a424f050e5':
  DO NOT MERGE Update CTS Verifier to R4