06a5359aaf
This patch broke some deployments not having the latest THT which configure the new wrappers; we shouldn't have removed that code in Train and leave it. We need to respect the stable policy and keep this code around for Train. Closes-Bug: #1866920 This reverts commit 19f0181d8325113d751611de099f4fc5ee8323b6. Change-Id: I13434d961e72a944e49e3ddba2ec512d4d786690