Give email its own version# scheme.  DO NOT MERGE

Change-Id: I258ffcf47d243417edadad44714f74247c78b366
1 file changed