am fe57f62c: am 9c322c75: am f7ec4e61: Merge "Never call app_main more than once"

* commit 'fe57f62cd854957cd64007ee23b0f70e6fcaea5b':
  Never call app_main more than once