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

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