Merge "Fix the expected tagged_addr_ctrl in a test."