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

* commit '7d85b5435d01f8d4856a718d655e30fb5a703560':
  Make DelegateManager thread safe