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

* commit '9c322c756276a9b22b05fd9c8bd67f2edfb50324':
  Never call app_main more than once