Replace 'indexOf()' expression with 'contains()'

Change-Id: Ida566a24d78174690b11d758c769b1d559b7fae9
5 files changed