use strpos rather then deprecated in_string

Change-Id: Iea81ab86570322519a10b1c24c04ab3be2ed5f9f
Merge "use strpos rather then deprecated in_string"