Merge "ANS experiment: Use ANS everywhere." into nextgenv2