Merge "Make not having Jack non-fatal." am: 5f88dd0dd6
am: 37a9e5d568

* commit '37a9e5d568c2e7b7ab2863ec937a758039b2745d':
  Make not having Jack non-fatal.