[automerger skipped] Merge "Fix sanitize address after scope" into rvc-dev am: 50532954ed -s ours am: 77d992460b -s ours

am skip reason: Change-Id Icaf1e6d379199eec4d664494819405acc013a003 with SHA-1 b9e1645e0b is in history

Change-Id: Ia093a84ebd5a1835e35b9e06b4a5bf8b98eceb4e