edit strings

Change-Id: I2d1cdea45b6b997a1369f8b210835c2fbfa54cc9