am 52f1edb3: Merge "Update tests for new build target"

* commit '52f1edb3f11aae1af74a1bfc6f18f81b4d761358':
  Update tests for new build target