Merge some address book related fixes from upstream