Merge "Revert "Revert "remove app-ephemeral"""