am f128225f: am a32933fd: am e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev

* commit 'f128225f93acb9479451d2806fe4d2e981fe34fd':
  ANR caused by incorrect cleanup in BroadcastQueue.