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

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

Change-Id: I9b6662d866c27002ea500a8510c8c854945ca445