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

Change-Id: I91116b99a23842691869e374933b634e28d2f548