Fix parsing of addresses. lp#1074039

Change-Id: Ibcb0d84985bec19f58c4454036633745b6c21aae
Merge "Fix parsing of addresses. lp#1074039"