Merge "Fix CtsVerifier failing to Set Org." into tm-dev