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

Change-Id: Iff2d7003f668f235cfc6d1713ba83b4a9fc5639f