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

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