ie8 indexOf fix

* ie8 doesn't support .indexOf() in JavaScript, so this should fix it

Change-Id: I66d6d8143ba3fa05237c4c3d7f400adb1277ce0d
Merge "ie8 indexOf fix"