am 9be7cd86: am 07b017dc: Merge "Fix BuildInvoke"

* commit '9be7cd8648312d01485d6282eec4982e0e9690d2':
  Fix BuildInvoke