add strings and remove strings to avoid fc

Change-Id: I8b875f05e95a3b418b3a3fae4a0d9b4893ba8218