Merge "Cleanup of CTS Preconditions work"