am 661e4783: (-s ours) DO NOT MERGE Prevent crash with bad Intent

* commit '661e4783a7c57f42849489ed54cf5495ada26314':
  DO NOT MERGE Prevent crash with bad Intent