am 6da9a761: Merge "Update template location for SDK build"

* commit '6da9a761cd06c67a9c30534b4da2b8447aced5d0':
  Update template location for SDK build