am d8e94409: am 49049aef: am 2e7aa675: am 489502cf: am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev

* commit 'd8e94409e031e97ba5aa966f2e7e97fd6bb43e32':
  Throw error when no intent can be found