am 7bfaffd6: am 08e5a8ae: Merge "Coverage and unbundling changes for runtest." into jb-mr1-dev

* commit '7bfaffd6357ab18bfd68ef23fd0c6890bd0d8783':
  Coverage and unbundling changes for runtest.