Merge "DO NOT MERGE Bump CTS versions" into jb-dev