Merge "Fix String Change baseline compiler errors."