Merge pull request #15680 from gtorodelvalle/contacts-bug-960525-undefined-last-name

Bug 960525 - [Contacts] undefined as contact's last name after merging
(cherry picked from commit ac717698a31dcefbcdd13574ebeb66ff7e7b57bf)

Conflicts:
	build/jshint/xfail.list