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

* commit 'e1bb1d3be9013226cc5750dc10cebe45c634765d':
  Make coverage work without test defs.