Deduplicate Address class

Change-Id: I4f6df51f5641475ffaf96b0189ccc00748880cc0
22 files changed