Add SafeString output for custom helpers

Change-Id: Ic5d1f0641c84763a9f3cb0b3f90afb0f50c0a03b
Merge "Add SafeString output for custom helpers" into frontend-rewrite