Merge "Revert "Revert "Remove $ from $ suffixed Unsafe functions."""