Merge "Add forwarding address checks for X86, arm, arm64"