Merge "Add getOrCreateCanonicalAddressId" am: efc16ab0d8 am: 5854e9312c
am: 3179ad0d40

Change-Id: Idbd353963c8dcfa245c39c8b78a48ae43fa8bc76