Merge "Cleanup dvr api headers for exporting"