Re-apply fixes from r1.9.0
Signed-off-by: Jocelyn Huang <jocelynh@nvidia.com>

# What does this PR do ?

Re-apply the fixes to the Tacotron 2 tutorial from #4209. Need to open this PR since those fixes never made it to main and the 1.10 branch.

**Collection**: TTS

**PR Type**:
- [ ] New Feature
- [x] Bugfix
- [ ] Documentation

# Additional Information
* See #4209 for original bugfix info.