am 0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev

* commit '0faca96f939b8530e5387a30e317d852f39f689f':
  Avoid deadlock by broadcasting outside lock.