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

Change-Id: Ib96c05f627475d501d4153d6e0a12427cec89c65