Merge "Define coverage paths using comma-separated list." am: 8a4b4e8432 am: 96bc733ae9
am: 78055c2bfe

Change-Id: If414c9d2868242e03abf20b2d21e317ffccca677