Merge "Fix issue where disconnect signal is not propagated to Telecom." am: e261001797
am: c83788198e

Change-Id: I7724b42498aefe11d28af0d60342f239c0a33ba0