am 834218e7: am e1bb1d3b: Merge "Make coverage work without test defs." into jb-mr1-dev

* commit '834218e7fb82ddb86375682c2fba3bd24074a427':
  Make coverage work without test defs.