Merge "Factor out HelpUtils into @SystemAPI lib"