Merge "Don't remove root password"