Merge "Fix sanitize address after scope" into rvc-dev am: 50532954ed

Change-Id: Ia26a19a5daca2bfc6d1fdd0917aae9e623a01757