am 3589c0ef: am 827e137b: Merge "Update the test output path." into jb-mr2-dev

* commit '3589c0ef736e3e5f0ee07f756cd83a5f7c281236':
  Update the test output path.