fix device info does not populate setup email field on device with email accounts.
Merge branch 'upstream-develop' into bug/automatic-setup-email-field-update
Merge pull request #376 from jofomah/bug/automatic-setup-email-field-update

Bug/automatic setup email field update