Code cleanup for connection manager Macro. Change-Id: I1526187e5efc6f4e38265d617c0342b4c1ea1228 CRs-Fixed: 2978727