am 0fe85d3d: (-s ours) am 302fd333: DO NOT MERGE Update CTS Verifier to R5

# Via Android Git Automerger (1) and Brian Muramatsu (1)
* commit '0fe85d3dbe2f62f42c4f417cf9143a094f52ec01':
  DO NOT MERGE Update CTS Verifier to R5