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

* commit '62db64f4f3bf93ee25cc54b74f906e74db2dbf1c':
  Make DelegateManager thread safe