edit strings

Change-Id: Id4c3fece348c5a20faaf41b5bb430d983e07f862