Merge "Avoid expression tree depth error in removeUnferencedAddresses()" am: 0931c72127
am: e84d609247

* commit 'e84d6092476421cca53726a98bab5f6ac055700c':
  Avoid expression tree depth error in removeUnferencedAddresses()