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

* commit '08e5a8ae69a8d6f9d50cc84768c85a73ddfa748f':
  Coverage and unbundling changes for runtest.