Merge "Use CTS/MTS mode to decide if we test vendorParameters" into tm-dev