Merge "Add omit files for coverage"