Merge "Fix sanitize address after scope" am: ff132d5cc7 am: 1589363857 am: e5599b53b2

Change-Id: I666c62b9161b68b81bd414da0a60895e0df9a07b