Some string cleanup.

Change-Id: Icf8ec1cb162353e24d6982f36e94691ead722eac
1 file changed