Fix return path issue witht ag mapping.
Fix return path issue witht ag mapping.


Former-commit-id: 37254dcdc0541070dd752cbb6ed6e860245c7c86
Trass3r/Halide,Trass3r/Halide,darkbuck/Halide,darkbuck/Halide,Trass3r/Halide,darkbuck/Halide,Trass3r/Halide,Trass3r/Halide,darkbuck/Halide,Trass3r/Halide,darkbuck/Halide,darkbuck/Halide,darkbuck/Halide,Trass3r/Halide