Fixes for bug 1342425 - T2 driver cleanup

Change-Id: I92acdba47b8a17b9aeb0d9151ba726eda57e6618
Merge "Fixes for bug 1342425 - T2 driver cleanup" into proposed/0.8.3