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

* commit 'd4842c374ab8f5578c8faca5a7e3f8d90bd7fab3':
  Avoid deadlock by broadcasting outside lock.