am e56287ed: am 62db64f4: am 83ec22a8: am af8c19e7: am 7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev

* commit 'e56287edcd564f2dfa57c0a9f6fe829f20c22377':
  Make DelegateManager thread safe