fix more name/address confusion. fixes blank From spinner.

Bug: 12586139
Change-Id: Ie5c52507653bde9621e3f3eac5281bd3642a5b5d
4 files changed