am 1a59d9cf: am 431ad293: Merge "Refactor BuildInvoke."

* commit '1a59d9cf19c43da7ad5e731b2d8c893f03faf1eb':
  Refactor BuildInvoke.