This fixes some config issues so that coverage tests can be run properly. Change-Id: Iaac0de8532f334fc1950e80e996733857f322c37
Change-Id: If4657f962966160ec63ba9d717f4e43d8b85ec16