Merge "Revert "Revert "Lock down String8|16.string() usage""" into main