Merge "Eliminate redundant methods in Address class" into ub-mail-master