am b5bbc477: Merge "Protect from null Intent" into lmp-dev

* commit 'b5bbc477e180d970c9a1006d5ca87c9b9c3b5939':
  Protect from null Intent