Edit strings

Change-Id: I33904697a49ed8abd0a9a87d7653463b0fc874a7