[automerger skipped] Merge "Don't use Address after it was deleted" into...
[automerger skipped] Merge "Don't use Address after it was deleted" into oc-dev am: e3e79d58 -s ours
am: d707fafb -s ours
Change-Id: I076b32ad9ed9013923817163a33ac492962efef3