Merge "Minor transform code cleanup" into nextgenv2