Merge "Removing unused method indexOfValueByValue"