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

* commit '2e3b36a2713b7b100172f91ab019d7bd256365f1':
  DO NOT MERGE Add invokeFunctor stub