Merge "Disallow modifying java.lang.String"