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

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