am c23f5651: (-s ours) am 5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub"

* commit 'c23f5651fd40eca1b751376c369fd9f3c9deb64e':
  DO NOT MERGE Add invokeFunctor stub