force it to use mailing_address not display address & remove coding on
address name as in 4.4 seems to work without

Change-Id: Ia2b5aae878f5667a9d81f8880d886c5b37b18679