Bug 921318 - Part 1: Use contactId. r=vicamo
Bug 921318 - Part 2: update xpcshell-tests. r=vicamo