Merge "More string lint checks."