Removes patching of ControlConnection class

Closes-bug: #1405825
Change-Id: I92c73b8eb9228fd7705278228f24f39bbafbfeb6
Merge "Removes patching of ControlConnection class"