Merge "Fix bug preventing multi-module native coverage."