am 45ec469f: am 7455393a: Merge "Update the test output path." into jb-mr2-dev

* commit '45ec469f2d9b323ed0ba784069888bc40d63cbbe':
  Update the test output path.