Improve coverage calculation

Change-Id: I66c8c692dcffd24342aa53038195b5c3daafa834
Merge "Improve coverage calculation"