Merge "Created SaveInfo types for email and username." into oc-dev