am e36829ee: Merge "Fix legacy disconnect callback." into mnc-dev

* commit 'e36829ee00d178846cb95bebde41cc9204edcd76':
  Fix legacy disconnect callback.