Merge "Disallow modifying java.lang.String"
am: b6e2c700ad

Change-Id: I7f2168ba772baa9cfac9be820d54aea647273bd1