Merge "Revert "Reenable debug cli telnet listener""
authorDave Barach <[email protected]>
Tue, 19 Jan 2016 23:16:48 +0000 (23:16 +0000)
committerGerrit Code Review <[email protected]>
Tue, 19 Jan 2016 23:16:48 +0000 (23:16 +0000)

Trivial merge