Merge "Fix bug patching panorama benchmark"