Merge "Add manual rollback sample app"