Moar Strings change

Change-Id: If0270a8c18e86b6b8fe25632c9e4c1105d2a04ec