Setting default personal information request to name and email only.

Also leaving the country selector in place as that is still something useful
and will likely be part of a "change my country" UX in the near future.

Change-Id: I302679f89e0326a3f935002354982348ac81edd2
Merge "Setting default personal information request to name and email only."