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

Change-Id: Ic5c0c71c4a2ae548bf4ff697af4e9ecc7a0b90bc