am cdc4b08c: Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev

* commit 'cdc4b08c5689737d59e9390e61673cca042c6058':
  When forwarding intents, ignoring the package set in the intent.