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