am 7d3603f2: am ac57338b: Merge "Fix crash with null intent" into lmp-dev

* commit '7d3603f2db54c2aef4d6dbb5924f4565c7a73990':
  Fix crash with null intent