Merge "Fix sanitize address after scope" am: ff132d5cc7

Change-Id: I08534133ad666ddcffd760f1639e17535045217f