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

* commit 'ee42072bcccab880dd685736a32a56ac62ffc331':
  Update tests for new build target