[automerger skipped] Merge "Fix sanitize address after scope" into rvc-dev am: 50532954 -s ours
am skip reason: Change-Id Icaf1e6d379199eec4d664494819405acc013a003 with SHA-1 b9e1645e is in history
Change-Id: Ib862faa3f6a47e812a39e09147e7b1374f0dca5b