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

* commit '83ec22a8826f3939b8161de5d68ef35b5f2e7c2e':
  Make DelegateManager thread safe