am 96310898: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '96310898348b409cc15de49baba8b7a31b9a8683':
  Don't use intent chooser