am 07b017dc: Merge "Fix BuildInvoke"

* commit '07b017dc8720352e9a8658c576bd43f0e9d61067':
  Fix BuildInvoke