Fixing trjconv -sub

The process of making code thread safe broke this.

Change-Id: Ie6617c00e52b09ea0eade2dcb0ae998e8ebf3cc4
Merge "Fixing trjconv -sub" into release-4-5-patches