Merge change 26614 into eclair

* changes:
  Make Contacts app not allow users to create empty label for TYPE_CUSTOM field.