Merge "Rename emma coverage files" into nyc-dev