Merge "CTS: Apply Jack diffs to expectation files"