edit strings

Change-Id: Ie47bd86506c5be69f9fe2d9664ec2ae6ea318eae