Merge "DO NOT MERGE Update CTS Verifier to R4" into jb-mr1-dev