edit strings

Change-Id: I4840e7e5fd5a4ea4145bb12a0c656a70292d2352