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

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