Fix strings back

Change-Id: Ib6024f9ab26e486f9eec190e9bdeebcf5e2def42