Handle cleanup of connection state manager timer
Change-Id: I5f15be60b4aab07ef57d4331d516d371cc831c45
Merge "Handle cleanup of connection state manager timer Change-Id: I5f15be60b4aab07ef57d4331d516d371cc831c45"