Merge commit 'f12773626484df90e08e5e50bdca81846950218e' * commit 'f12773626484df90e08e5e50bdca81846950218e': ADT: Remove StreamHelper and integrate it in AdtPlugin.
Merge commit 'f12773626484df90e08e5e50bdca81846950218e' * commit 'f12773626484df90e08e5e50bdca81846950218e': ADT: Remove StreamHelper and integrate it in AdtPlugin.