Merge "Fix the signature of the IndexOf entry point."
am: 4cb069fa2f

* commit '4cb069fa2fd967312d5884b86bbdac343df9eb28':
  Fix the signature of the IndexOf entry point.