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

* commit '8c630c721041e0ad9d6631b19538e5153b81599f':
  Fix the signature of the IndexOf entry point.