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

* commit 'af8c19e770717b209ca0c0cf0549eaeff8f1c78e':
  Make DelegateManager thread safe