Merge "Revert "remove app-ephemeral""