Replace jQuery.inArray with JS native Array.prototype.indexOf Change-Id: I0031f0385e440a34846334d158425182542a9ac9