Merge "Add support for coverage flushing." am: ae0e2fc891 am: 8916d3a8ad
am: e371f105c3

Change-Id: I4f137299568ac126f08810e14909a149d58ea2aa