Merge "Add support for coverage flushing."
am: ae0e2fc891

Change-Id: I0895c9a91e84b59a02f3f3034c3de75d3ea9826e