Merge "clpf experiment build fix" into nextgenv2