I am trying to figure out the right way to enroll a Samsung Galaxy S7 Corporate Device.  We are a small company with about 30 corporate phones and another 30 BYOD phones.  I am using the free version right now with the goal to continue testing and probably move up to a pay version over time.

I enrolled one Samsung Galaxy S7 phone by factory resetting it and using the Google User of AFW#MEMDM and enrolling it as a non-Samsung device.  It worked great and is still working.  I enrolled it as a non-Samsung device because if I told the MDM that it was a Samsung device it wanted to use Knox, which I don't have setup or it told me to install the app first, and I was trying to avoid using a google account to initially setup the device.

I just tried the same procedure with two new phones that are Galaxy S7 phones, but instead of ordering them from Samsung directly, we ordered them from US Cellular.  When I set these up, using the same procedure, I end up with a policy violation saying that

       Add Managed Google Account. 
            Some apps needs to be updated to add Managed Google Account.

If I click on that, it takes me to a screen that says "Android for Work", shows Play Store with a check next to it, Google Play Services with a check next to it and "Remove temporary account".  If I click Remove, then it takes me to where I can try to remove the Google account, but the only one there is the Android for Work which cannot be removed.  As near as I can tell, it has me stuck in a catch 22.  I could really use some help.  The MDM Plus manager actually shows the phone as a Samsung phone, and everything looks the same as the one that works from the management console.