Remove in_string() usage

Change-Id: I8ff74a827d742fdaf7d63d51be1f2300bbb5436b
Merge "Remove in_string() usage"