Merge "Remove commented out explicit evs service start commands"