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