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

* commit '5f67b0ae6a481db883fd78f43aa9b4fec0488305':
  DO NOT MERGE Prevent crash with bad Intent