am be4cf42d: Merge commit \'0f222c0c\' into manualmerge

* commit 'be4cf42d087a32ac7ccd24c0f97e316436687d5c':
  DO NOT MERGE Update JB cts and verifier version