am b26249b7: resolved conflicts for 421977ae to mnc-dev

* commit 'b26249b76ab3a449b479eebfc28032775b74e5fd':
  DO NOT MERGE: Protect data source access with mutex during disconnect