Merge "Handle contacts whose account name is null" into pi-car-dev