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

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