Merge "Add getOrCreateCanonicalAddressId"
am: efc16ab0d8

Change-Id: Iac6050138195b612815721e00241d9b31d3a580a