Merge "Merge identical postal addresses for the same contact" into pi-car-dev am: 8b157b7299 am: 31e7f2c7db am: 8dc045faf2 am: db8c916629 am: a3d169da50

Change-Id: If7918ab568abbf426608e8fc3bab015db26cfd8d