am 414d50bc: Merge "Fix issue #6234928: android.app.IntentReceiverLeaked:" into jb-dev

* commit '414d50bce61be36dac88a6aaad138f99e2e26513':
  Fix issue #6234928: android.app.IntentReceiverLeaked: