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